Skip to content

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Jul 22, 2020

this sadly does not change #74614

r? @eddyb

@lcnr lcnr force-pushed the polymorphize-functions branch from d843e09 to 4d28763 Compare July 22, 2020 10:50
@bors
Copy link
Collaborator

bors commented Jul 22, 2020

☔ The latest upstream changes (presumably #73270) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 22, 2020
@lcnr lcnr force-pushed the polymorphize-functions branch from 506655b to 40b6bcc Compare July 22, 2020 15:03
@eddyb
Copy link
Member

eddyb commented Jul 23, 2020

@bors r+ rollup=never (I know it's small, but we want to be able to bisect anything polymorphization-related)

@bors
Copy link
Collaborator

bors commented Jul 23, 2020

📌 Commit 40b6bcc has been approved by eddyb

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 23, 2020
@lcnr
Copy link
Contributor Author

lcnr commented Jul 23, 2020

Considering that polymorphization is currently disabled we don't need rollup=never here

@bors rollup=always

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 24, 2020
Rollup of 12 pull requests

Successful merges:

 - rust-lang#74361 (Improve doc theme logo display)
 - rust-lang#74504 (Add right border bar to Dark and Light theme)
 - rust-lang#74572 (Internally unify rustc_deprecated and deprecated)
 - rust-lang#74601 (Clean up E0724 explanation)
 - rust-lang#74623 (polymorphize GlobalAlloc::Function)
 - rust-lang#74665 (Don't ICE on unconstrained anonymous lifetimes inside associated types.)
 - rust-lang#74666 (More BTreeMap test cases, some exposing undefined behaviour)
 - rust-lang#74669 (Fix typo)
 - rust-lang#74677 (Remove needless unsafety from BTreeMap::drain_filter)
 - rust-lang#74680 (Add missing backticks in diagnostics note)
 - rust-lang#74694 (Clean up E0727 explanation)
 - rust-lang#74703 (Fix ICE while building MIR with type errors)

Failed merges:

r? @ghost
@bors bors merged commit a02aecb into rust-lang:master Jul 24, 2020
@lcnr lcnr deleted the polymorphize-functions branch July 24, 2020 15:01
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants